Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 02:28:14 +0000 (19:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 02:28:14 +0000 (19:28 -0700)
commit781f56119580f9ad7fc7eb9e18a1aa8c4ab05693
tree5e03c3a0a2ddf3b87d331f919676bfb4cb9322ea
parent2f06796f923aaff02587b31c4d4e634d5bcb1180
parenta8bc0fc7f3a369117a3d341ad135e4c54adfabd3
Merge from trunk.